Add more database code, need to do the handlers.