reorganized subscriptions and almost have detail view working