Starting to add in selection pain for demos