Some OOP
Fixing load more