Fixed bug in database build-up + really finished database implementation this time