Simplifies API (for now...)
Adds experiment files.
Worked on ConflictHandler.
Adds new tests (doesn't not pass).
Test fixed.