pulled together functionality
merge issues reso