Redo most of the IA. Quite satisfying now