More baby steps

Signed-off-by: Chris Dodds <chris.dodds@unifymediation.com>