WIP on more specs