Safty commit, about to do major refactoring