Almost finished with Dockerization