WIP in progress, final integration