Great, that looks good.  Those TODO's will also need deleting.