Added more bad OOP code