Some additional requirements have been implemented
Changes to better reflect the initial design
Tiny removal
Conflict detection added