Update the overlord solution

There is way too much happening in this line of code.