Will redo class coding in that style once I got some spare time for it. First made sure everything build again properly.