finished updating models to reflect git-to-work