Refactor, data layer ++, tests++