refs #4: Sort of works, still needs some love. And validation.