Implemented basic data layer + first data layer test