Merge

Ideas collected by Daniel Fitzsimmons