Working on it, intermediate commit for records keeping purposes.