Fixed everything so that it compiles... woot