Some TODO for weekend if I get time.