todos, restructuring
introducing queue, fixing damage, better test-suit
forgot to save beforelast commit