Thread edit now generic plus tests passing.