Made a start on rewriting DBp Spotlight models