add new files
lattice needs refactoring