Accidental rollback, reverting it.
Merge branch 'Rewrite' of https://github.com/mAarnos/Hakkapeliitta into Rewrite