huge change to add other contextual elements