manual merge with aaron's stuff.
Still need Layer## images to run. ..