First demo
Minor changes after first review
Added notes
Further cleanup