TODOs, formatting fix
Initial setup for assertion control