Shortcircuit

@Lidor7 @brirob1113 way-too-long code review pls I can sit with for this one

This pull request should be off of urbanspoon/split/master and shouldn't go back to andrew/split