Polish it off - v0.1.1