working on design a bit more