Preparing for better OOP methods, adding unit classes