Committed Working Version for todays demo