Replaces #346 Co-authored-by: Charlie Birks <charlie@daft.games> Co-authored-by: ThomasPDye <tompdye@googlemail.com>