Prep for setuputils