actually committing code for rewrite. D'oh.