Feat/refactortofeatures