Added 2-Step classifier; code needs refactoring