Add start of unit tests, reorg to accomadate...