Most TODO's removed, added sql databases