Major revamp - continued, not finished.