Working on last database methods
Finished database functions
Finished merging