Last try at Task List support (hopefully)