Updated class File. Work in progress.