Sam and Carter: Finished refactoring for now