Merge Christina's files

Building