Database

Ready for merge... I think. The ColorFix branch should have a pull request made after this one is merged as it's a minor change to the drawing methods but does work.