WIP on standalone distribution