Resolving todo's