Lol properly merged and hooked up now.