Some additional TODOs having to do with access level modifiers.