Lots of changes..been remiss on commit.