Redid stuff, gonna mess around with this some more