Merge pull request #3 from alecjohanson/alecj

milestone0 code, still need to change subscribing to Christian
milestone0 working nice