placeholder commit as a try to remove sf flags. may revert to this
checkpoint for doing some more surgery