Did a lot of things (sorry for the misuse of commits)