got both switch machines working
fixed issue where mouse movement wasn't normalized to screen resolution
saved scene
got all functionality working in the main scene
fixed merge conflict