More types added. Wiring almost coomplete.