A lot of work everwhere

Mostly work on getting the data to display properly. (still not there
yet)