Resolving all my bad commits