Merging in boxen changes

To lazy to do a rebase properly, quick PR it is! :+1: