Fixed merge conflict in config
Fixed up some imports - basic compile and test performed