Ston 0.5 merge

OK So this also can't be automatically merged. But it works and includes the recent work Sven has done.   I think that we need to get the renamed packages from Sven's repository.