Refactored Transport class, From icons, new form tool, error checking.