A bunch of cleanup, moved more data over to preloaded using dapper, and maintained throughout runtime