moved around some code and commented out 'unnecessary methods' (work in progress)
added tests for classes and moved views around for easy access