Looks like I was pretty tired last night, fixed it up so things are
actually working out of the box now :)