Couple of todo