Databse classes added, not woring with the rest though