Work on more efficient database (less querying)
Work on new database querying functions
Complete conversion to new DB format