Added new class file. (Some still contail stubs)
WARNING: (Code not working)