Just some more changes...much work to do before library is complete.