Refactored Add to account for multiple units