Refactored code and implemented remaining primitive data sets.