Added loop option (WIP)

Loop shouldn't be enabled as it's currently in progress.