Rework of setup + started dev