Working on final demo prep