Moving to docker and psql - wip