[WIP] More AbstractHandler attempts