More setup changes, adding sample code to run