Cleanup up a touch and almost got execution working.