Add some basic classes
first run at type checking