some refactoring todos in timber.php for Jared