Revert "in progress on un-breaking basic functionality. current issue: subscriptions dont work"

(whoops, didn't mean to push)

This reverts commit 920f222e080c04527c9e08c303c24c967f2a051c.