Goto statements should be banned, apparently

They really are a BAD THING
Awesome job! Go ahead and merge this back into master.