Refactoring, and trying to recover old functionality.
Aging function seems to work...