Reorganised, added a WIP rogue clone.