Would love some feedback on wip feature