Implement previously unimplemented functions.
Change function names to correspond with types.