db stuff working - need to make sure info is clean