screwing up a few things… will fix later