Probably should commit more often