SPA - more work to migrate functionality