Added slight randomness and organized(ish)