Started working on a clean approach