Commenting code and updates to resultshandler