Removing majority of code in other classes, will be rewritten