Is there a better way to do this? Should we expose the week in the API?