Still glitchy but works