some tmp commit
Tested, ids are linked, small refactoring done
Merge pull request #18 from dzdidi/all_together

Tested, ids are linked, small refactoring done