Moved even more stuff around in the DB hopefully this is a more elegant long term solution.  It feels very modular in it's current state.