Better code execution watching

Now with less hacks to modify code