Finished initial testing -- implementation details still TODO