Refactored install a little. Find another utility?