Lots of updates. Restarted dev work