Done for now.
Modified Overlord to match format of other code.