april first pass done.

finalization coming soon.