convert the rest of the functions

* now just need to make sure that we're not making assumptions
  that are no longer correct about datatypes...