Working WIP :p

Seems to be working.
ToDo:
- Check in more situations
- Remove (possibly) unnecessary changes
- Check restart (i.e. Morisawa->Herdt->Morisawa->Herdt)