Lots of change, new handler structures