Accidently broke things with the merge, fixed the problems