New design stuff

I am going to push this out right now