database sheisse ALL WORKS
fixed small merge conflicts