Add some stuff that we can do as automatic setup - maybe the package way