updating things for meeting with Prof Olson, even though it's unfinished code