Debugging, updated TODOs. Commit before pulling
Temp fix for CreateUnit. Excluded parents for now