Code merge from previous version (not tracked in git) -- can log in and play GSIV at this point)