Started reworking Individuals/Fixed bug with unittests