adapt webapi to new database magic
MERGE!!
DAMN!