Partial commit for issue #2