Added location. Randomization is TODO