WIP: Refactoring

It's not only refactoring I added some other parts too. I'll go make animated gifs for better visuality now. :dancer: