Improving OO.
WIP before deleting context.
Context deleted.