skight datastore restructure to columnar and edits to class