Achieve about 90% completion; TODO: Fix the database issue