Update the overlord solution

See above and restructure this method.