- working, still needs work on the ht/pr modules
- deleting old classes adding missing ones
- fixing issues
- more issues