Morning merge
ticks can now exist independent of groups