Merge of all previous Versions.

A lot has changed. please consider pulling everything back into the main repository.