not sure all that happened, but commiting