completed reset function, working on remove function for refactored solution