Sync with Fritz

Sorry for the monster pull request ... will use branches now.
if you want to remove files ... do it ... if we want them back, that is why we have history