Finished Adding Current Classes