Updates from Ted @workingdev