Vanessa's branch updates

Most up to date files as of 1/9/14