Progress Report on the Development of Design Tools for Wave and Current MHK Devices