Feature/adrian/inital setup thingies