Towards More OO