merge Coopernurse's base repo