Adding first draft classes