Update 1

Minor Updates. All classes working now.