Initial code commit
Tests update
SDP update
Conflict resolution