Reorganize handlers some more
Use instance methods for agents.