WIP -- Add some assertions
WIP