Feature/4 jan random

#4