Forgot to commit some work again.
Added some stubs.