Added soe TODO's