[MAJOR] BWARE paper commit

This commit should be split up, in smaller pieces. But will do this after release.