Make handler more convoluted, add possible support for Chester in the future