Pull in changes so far up to our attempt at the 3c demo #12

Closed koninckx closed 9 years ago