about to merge with doug's stuff