Updated TODO! FINISH THEM FOOLS!