Cleaned up TODO's added scratch JSON after discussion with Rich.