updating before merge
note to self: pull before doing new work