database filling in doing... needs some performance check