added queue, additional file parsing