Feature/two factor settings

going to do another review tomororw (and write a description here), but i think this is about ready to go ...