Got the screen updating for new data, just need to fix the ordering logic