Updated website and synch with Tessa's branch
Updating branch to match Tessa's code.