NEW: more todo's