Democrats Propose New Plan for 'War on Terror'