Resolving TODO's