You don't have to merge this pull, I made it so that I can comment on the differences.

Didn't touch this, will change it later to a class view as well.