Better multiple line handling, etc.