First version with new name scheme

Function names won't be changing nearly as much from here on. The general structure of the module is pretty fixed now.