Final Week Commit 7

Final demo