edit iou and things
various
 merge conflicts
compiles