Add in tick logic