Merge pull request #10 from drobbs/master

Work on the Ally system.