Issue/#440

Fixes #440 

- Although this isn't finished and not translatable just yet - is a great way to check everything will build correctly.