Commit for meeting on 12/01/2013

Working proto type with a few small additions still required