First working commit to v0.0.3