stuff moved around, and performance test app now working somewhat