more work on new SPA architecture