More work on my new handler