Add a bunch of missing returns - WHY WAS THIS WORKING?