Removed classes that are still out of scope. Continued filling in the blanks.