Created completed version of Demo 2

Walked through all the steps in the Demo 2 Wiki article and implemented
them all in the Complete version