Add code to create initial subscriptions and fix bugs :(