Move context to this. Closes #1202