Fixed #21.
Refactored class for convinient testing
Removed that HORRIBLE global variable catalogs
Removed unused code, don't add methods who don't do anything
From now all commits should pass the test suites.