Started fixing the horrible unreadable indentation so I can actually figure out which blocks do what.