Feature/tick loop