For the future...

Added additional future functionality