Committing with everything mostly behaving the way I want