Re-wrote installation, relevant to #4