Refactored A2J Author.

Next step testing.