Add a bunch of completion stuff