Pushing current progress on making the demo work with php 5.3