Changes the way we read from the database.

Mixes up some of the plots too.