* Moved all code into class structure