Fully working now on dev, need to refactor and clean up some code now