Added some funcionality.
Pushing so that I can startover with the rawdata.