More work on redesign.

Work in progress...