Work on war assembly & overlay