added Tray,TrayTest, Solver