More stuff for inital commit

Signed-off-by: samjudge <sam.m.w.judge@googlemail.com>