Reworks and New Classes I\'ve implemented