Add within in math methods. Add todos