Fiddling with testing
Type signatures
Adding logging on handling conflicts