Rollback point before sizable refactor