Complete version

Database + logging