TODO's reviewed by pwicke