Update for full bank support.

Nearly finished.