Oracle implementation + fixes

Hey Nathan,

Here is my first attempt at a pull-request. I hope this works.

Best,

Philip