Removed bullshit code, added a TODO comment
Added a general class outline with some TODO comments; should be self-explanatory