- move functionality into features