Adding some TODO comments with fields we'll need in the future.