Screw the non-template approach

this with UI-tweaks should work