* Moved code into class structure