big model refactor, project dict works