Updates to features, break out overlord features into separate files