closer to getting it right
merged