Commented on new classes and updated todo