Changes to make MVPaa more robust/fast/simple, in progress, not useable yet