Another refactoring of the fill_out methods. Much cleaner.