moved more stuff around for put-stuff-where-it-belongs refactor