Dev wed

bringing in all of Erika's changes and cleaning up some weirdness with her original files.