Ss/experimental refactor