Initial coordination commit and revisions and changes to frames to accomodate the new frame matching. Still need to handle leftovers...