New settings, half tests passing, others commented out
Add new context partials
A good start...