[@Jedly]

almost done