Updating to make use of stage and actors