Everything starts to come together

Merge master (after Audrey's commit) to Lesly's branch