overhaul complete..testing beginging