Added generic database methods and batch method, finished lab 2.5