* Finished first part without tests
* Updated naming convention