Laura merging in new stuff

Learning how to merge.