made more complex

added some more complex strucs
changed order of properties and add some more complex collections to work on next
changed logic

changed logic to handle some more complex collections