Adding in a core class, and moving old class to tinker.