Finished sorting out the asserts
Merge branch 'master' of https://github.com/benjaminy/Charcoal