Some updates and debugging - issues getting files to work together