Pushing additional changes to attempt to make this functional.