Removed unit fiddling...I will move this into a feature branch