Got OOP refactor working at a base level (can extract aspects from raw data)