Database class is done, Block/Order class update