Add some fn goodness