Close #5 and merge this back in

We have lots of changes to make, but let's do it on the master branch.