Started fixing shit, finish it diego