updates to pom, reorg of some code, some testing and next need to tie everything together