Added indexing of tasks. Need more work.
Fixed potential problems related to adding new properties to Order.
Resolved mergeconflict