reverted to old subscription model

Signed-off-by: Andreas Heiberg <git@andreas-heiberg.com>
added proper toggle functionality

Signed-off-by: Andreas Heiberg <git@andreas-heiberg.com>