I think that's it

Should fix #3

That brings me to the end of this phase.