WIP for Win8 build/package