Moved ArgsAndReturnValues to own public class
Added cases to match test example.  Still needs extra credit implemented
Added extra credit for A3