Add an initial naive implementation