Laying out foundation for more OOP based code