Moved some things around
Added components.
Changes to CMakeLists
Removed toloa calls.
commented out unused functions
Temporarily commented out override directives.
Fixed some things from the mass replace.
Fixed some more stuff
Got it working, finally