Bad Guys added. OOP refactored