Expand numeric scanning (need error handling now)