Merge Matt's prototype on dev?

Let's try?