Updated to work fully. Still a few cleanup tasks to do momentarily.