Super tweakage. Almost there, but not done