Added structures, tried injection stuff with DBpop (need app server)
Merge conflicts