Update #7

Added and deleted ALOT of stuff