major updates to all classes