Lots more

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>