Started aoe.  Minor bugs left
Finished AOE
Fixed strange vs file bug.  Merging Scott's changes into master