put both Ryan's and my flapping code into player.cpp with mine currently activated.