Improving return code system. Now to use 'em...