A little more functionality and a barebones test script.