Integrated Mathew's help - now functional.