Finished version 1

Finished development of version 1.