Database class nearly completed