OOP release

Added OOP and some fixes
Added pagination (testing)