Think I broke it all cleaning up, this should fix it