1st commit; mostly design in place and single impl