3rd commit does a lot