Major toast refactor