- Changed the protocol around, split into handler & protocol.