Got rid of all the *Func classes #22