Units OOP & logic