WIP-Ma.k soldier conversion