Added a new class and some todos