juliets work so far
quick edits from dan
Merge branch 'dan_server_side'
merging
merged with master