Feature/loop 2nd iteration

LoL