added userdir. still very dirty