Completed the refactor. The explorer works fully.