Version 2

* finalizing coding
* cleaning up