Ver 0.06. Cleanup and scribbles.