Refactored the code so this repo will work as our main project repo