Merge pull request #2 from alecjohanson/alecj

Alecj
milestone0 code, still need to change subscribing to Christian