Initial Refactor Complete