Data layer done, some code commented out since...

dependent on other layers