Forgot to do commits, everything is done now