Various updates and finishing out class 3