Done converting over to new notation
Remove old ones
Gutted main, needs to be rewritten with new system