Had a breakthrough idea, cleaning up before branch