More boiler stuff, almost done!
Annoing eclipse auto-indent, ready for immediate revert
Revert "Annoing eclipse auto-indent, ready for immediate revert"

This reverts commit 62f3d05ae85ce2446693fa0c56172f05b28e8da3.