Added new class, not using it yet. Also added more comments