Adding in some of the original demo machinery