Hh refactor

See commits for the edits I made.  The major issue was that some of the migrations were broken, everything else was OK.  Let me know if you have questions.