Added more classes. Most are empty functions for now.