Work in progress
Renamed handlers
Using new opcodes