almost have it working with updated dependencies