Very close to solving the data layer issue