Work in progress on the operation context stuff