More updates, refactoring, and progress