Don't expose JSON just yet + add TODOs.