Refactored + test feature iteration