db works but not organized well