rearranges, begins to add more methods to DB.php