Review Only

Opening PR for review, don't merge!

@simon-weber 
I like the shortcircuiting, considering it isn't really *that* verbose