Moved api_version back to Shebang, since it is rule-specific

Added TODO comments