Revert "So far what's done"

This reverts commit 3f2702c762c113b8da022358c68feb85ff556127.
Database again fixing

Database again fixing
Changing Setters

Changing Setters