1st wave done
filename changes, etc