Added more logging and basic tick code