stashing for merge? (I didn't think I had changed anything)
initial push for ellis/dave edits