Some more code & dockerfile