Updated Class File

Currently not completed however.