have a few objects being updated using the timer event
fixed some git stuff
had some shinanigens but hopefully its fine