Main commit 

Main commit with final files before demo. Please merge.