0.0.1.1a

Changes and cleanup pre-meeting / discussion