Refactor names, and completed solver