got rid of complicated data alteration + states, went back to having angular do sorting and labeling