Added hacky marquee
merge LOL