Fleshing out some of the extras - needs a cleanup