Continue overhaul add Customer class