Data Layer almost ready