Add framework for cursor, and rejig callback structures.