* doing some TODO's