Finally making progress on getting Strafunski integrated