redesign underway, major code clean uo (finally)