Adding some more companion stuff

Not complete yet