More assigments. Cleaned up some files.