#173 Attempted fix for ordering issue

Now uses a list rather than a dictionary