Re-factored, defaults to steve if not found, fixes issue #4