Last Commit Before Trying to implement row switching bug fix