start to redesign, not beutiful
alexsa's changes