Core 4

Added even more classes. About half done with those now.