Renamed a few things and added a second demo program