loads of stuff

Signed-off-by: Owen Harris <owenllharris@gmail.com>