Initialize base code for the refactor and add dep