Adding some stuff for companions

Not really done yet, just want to commit