Move tick into class