Some Design again. Needs to motivate me a bit more ^^'