Added shop object, more work on file parser