Start of the little refactor
The little refactor has been completed, still need to fix the hud views.
Not sure what git is doing