Binary object

Thanks for refactoring at least this part of this functions file.  Some more left to do, but every little bit helps.