Implemented the old stuff
Made a bunch of changes and forgot to commit them