New design implementation [WIP]