Refactor subscription system, get helpers working and shink output a little bit.