Purge a old class, updated a few and added a few