organized units and created units and updated assembler for units