Split DB out into a separate struct/file too