Changed stuff around  bit, my username is no longer hard-coded as the subscription source