move make current into context object