Began laying ground work for datalayer