GhostManager

Commit Merge and update to the GhostManager