More work on DeGhosting
Hopefully took care of merging conflicts