rawdata is probably better
better naming scheme start
removed unused stuff