add subs and tests
more subscribe stuff....