Started adding the context class && a bug fix.