More work on OOP and other features