Rune - Further Object abstraction work