Work-in-progress

A small update to the datalayer. So sleepy...