Commit Josh's work on this code.