Toybox changes + minor model handler changes.