Off with it's head! (Pager)

First part of #6248
Seems like there is state+methods in this dockable stuff. Would using an actual class with state+methods clean everything up?