moving a lot of things around in response to feedback. still have to add hours