Later, but definitely as we refactor the app tier