rewrite...

Signed-off-by: Tom Grennan <tom@apptimist.co>
more rewrite...

Signed-off-by: Tom Grennan <tom@apptimist.co>