Close #4

This is probably good enough for now...