refactored a lot of code to a helper class. added new section for set items