Massive savepoint before I start working on a MS implementation
More re-structuring
Interim-commit