revert index to master
Move Context to a class