Class Update

Updated most functions...