Note: going to refactor and change to REST based