Making a start on developing v0.3.X