Move utilities to one file and add atmosphere
Second try