Updated files, etc... Rough working testbed. Need to bifurcate example and testbed.