General Update

Added a few classes, haven't filled them in yet.