POX development (mehone's path)

this is the alternative to me_the_super's smerge, mehone will be working on this instead