Back to dev changes

Note this must be merged after #14 (is built on top of it)