Demo is not quite working; committing progress anyway