Started adding methods to handle execute methods, refactored some names