rewrite safety
prior to a major rewrite, dunno really what has changed, think smaller
changes or nothing