Added registration validation. I've diverged off from The Way a little - but that's fine.