Added all functionality of feature 28, no WPI-53 functionality(saving)