Adding tons of asserts further hacking