Fixed formatting
Starting the AST/3AC descent into madness
Merge branch '3ac'

Bringing the HEAD up to date before beginning the real 3AC left to do