Refactored to remove customer id as it was redundant for this app right now.