Finished up some of the odemetry stuff.  Leaving it in loop because it needs to track local variables and fields.