#26 Almost all work with database finished