latest changes for skeletoning out some remaining functionality