still mucking about with Handler types