Implementation interface tweak (Sorry, Kasper!)

Preimplemented some implied code, general de-bad-ing.