About to do significant code changes, safty commit