Update Joey

This really needs redoing. Features and Edges are all wrong, still based on Jack's ones.