Move base stuff into init.pp