Wip/1.0

Finish version 1.0