WIP - Fix crashing on instance switch and add
mistakenly omitted logInOut method