Nestings todos

finally had some time to do work!