added unitid assignment to all units, added unused initial analysis code