Third Commit

reworked on DB & Model