SPA wip
Add subscription
Merge pull request #1 from munissor/spa

Spa