database needs work