All done..now need lots of refactoring and testing...