The context stuff should be fixed - full ack