wip
wipip
cleaned up storgie for queueing
merge merge merge
meeeeeeeeerge
Merge pull request #131 from Korovyov/master

cleaned up storgie for queueing take 2