Bug seems to be fixed - lots of asserts added in the process :)
Merge branch 'master' of https://github.com/Mattias1/north-american-octo-meme