Adding, dropping and changing units

Adding, dropping and changing units