db working...a few more changes to go