Undefined step hell

Pushing to master for fun and profit