Quick fix.

Still working on populating DB