[@Jedly]

almost done?