Starting to clean up stuff, need player to wait...