Backing up, code still won't compile. Refactoring is going well.