Va academic plan dev

Merging dev bits.