implementing rough draft for new design. general structure in order.
lots of fine tunning remains