Refactor to the assert infrastructure
Can plug in now