Nested functions don't work automatically

This will require a restructuring of the functions.py code and how they are called. For now, we use derivatives ($vals) for when we need to nest values.