cleaned up logging and transitioned to when
0.1.0-6