NOT WORKING - Partial work on verify & refactor