Issue/1 setup