Add an util component
Refactor and make progress