Initial version of atomwavtoatm; works but about to refactor

Change-Id: I6377ad48cca73314cc2bd5682ba430b37db37dc1