merged files from zach and ian