Make tests pass, almost there, paste() needs attention