All the stuff! Is done! Didn't do the best on commits.