SQUASHED MOAR BUGS
Merge branch 'refactor_add_fade'