WIP:Pxe refactor

relies on #615