Design work

Meh... we need some updated stuff