Here we go; commit everything; seems to work