Refactoring; resetting the odo is nicer now.