work-in-progress - checking in while looking at other code on master. may be broken