Basic functionality

* Fixes #2
* Fixes #3