Deleted a bunch of code and did it in a way better way