Added Data class to occam, have some errors when adding elevation still