[sotonin]

As soon as the major bugs are worked out. We switched to a wr/current cvs merge last night so we just need people to test it. THe major things being worked on right now are making the AA interface actually work properly and disciplines.