Expanded class methods; incomplete.