Moved more frame code to proper place. Still doesnt handle strikes
properly.