Design change

I'm not going to make things needlessly complicated