closes #1429, closes #1472, closes #1358

I made an issue for this, its a little more convoluted that I had anticipated.