Add overlord. Remove functionality from master