Refactoring to pull API calls down to a client layer and move towards a dumb UI