more cleanup/organization, getting views ready