adding remaining somehow untracked worked having new datalayer implementation not fully wired