kinda got page view to work, not showing the right stuff yet though
Merge remote-tracking branch 'origin/master'