Add Methods and test code.