DataBase Kram, nicht fertig
Merged current develop into database. ARTEFACTS REMAINING
All artefacts commented out. See TODO comments