work in progress
merge bobbi
fixing merge conflicts