Updated shiz, needs cleaning, but it's looking better