Closer to proper odom handling.