Working to spec. now to add tests.