Intermediate Fixes - Not everything works

This is a check-in to just get it out.  Some major issues exist in the
version.