Data Recording Added

Data is recording, and functionality is cleaner