Added missing implementations.  Test cases to follow.