* Create custom context class * Documentation * Remove old help method, replace with new * Update from rebase