Modified a bunch, added some animamations