Implemented support for Selections MFA, some error handling

Don't know the status of your work on this, but I implemented a few things so if they look ok please merge. I'll probably add some more stuff over the coming weeks.