.gitignore updates
Improved serialization and order fulfillment
Merge
Fix failing tests