Committing more broken changes to aggr branch so I can fix my dev environment