major build, still messy code, but final look achived