Reduced the swears.
Passed back the actual correct data type too.