router updated with subscriptions function, waitOn removed/depricated(?)