oops... I'm combining two different things in this commit... so I'll try be clear