Work in progress of the new design...
More work