incremental checkin. added some tests. have not RUN said tests. :-p