moved stuff out into razz

Signed-off-by: Chris Jones <chris@jonezy.org>
using Razz

Signed-off-by: Chris Jones <chris@jonezy.org>