- Adding function name detection
- Adding functions to scope
- Fixing sanity tests