Next round of changes and a TODO!
Mainly focused on: DB abstraction (Psql and SQLite3)