Partial commit

baby steps -but getting there :-)