Procrastinating on a fix for the last major bug before beta by… adding new features instead!