Made Working YAy

yeah so now this works, i still need to integrate but its late and it should only take like 10-15 mins tommorow so we ok