code

Some code changes, Object changes, More thinking involved for next
revision.