New design implementation - work in progress