Fixed up

Got rid of toast and hacking mainframe