also, I made a lot of changes in the code, it is a big one, if I broke anything please give me your feedback.