begin implementing proper Context handling