skills_group -> locking in choice working version, some code shuffling + tests still needed