20100714 exercise functions added, other code missing