Bit of setup so that we can extend the Oni class

Signed-off-by: Sam Hellawell <sshellawell@gmail.com>