Works with spaces now, but need to fix gaps