Added Companionship stuff and ability to see assignments