Added more structure, most everything's laid out the way I want it