V0.2

A bit of waffling.  Nothing major completed.