Handle some additional cases, more debug, start returning lists of values