Updating TODOs.
Added a flag to skip directly to a level.