Added TODO and fixed MOING_TO_SHADOW