Lori

merge Josh's folder with the main view.