Basic setup
added the new classes