Major rework, deleted several files, commented code, implemented some of the TODOs