About to do sigificant refactoring, safty commit