Updates and more classes. Coming together nicely.