Just need to add an animation and it's done for the most part...