Update Code from Test Version

Moved all changes from the test version to this demo version for final
course submission