Added more original methods/classes

Only thing left is commands. Still deciding if I want to keep original
setup or break out into individual commands...