Working on some of the extras