Completed the second stage of the database rewrite. The premade
datasets are merged in. There is still a little work to go in
updating some of the methods, but I'll handle these as I work
through the forms and templates.