Changed todo's based on requirements.