almost done. DB saving remains.