cleanup/addto
update ps svc
refactor
add one file
cleanup and get rid of spurious errors
Merge pull request #12 from val314159/feature/pubsub

Feature/pubsub