This should be cleaned up - either one branch, or the other (or something else)