A bit of code shuffling, add multiple choice