Add new generic code factory wrapper

and up the stuff a bit, not really sure what happened here

yea
it's good
:100: