added the core class too >_>