Trying to fix some context woes to get the properties injected properly.