--- a/scn2k/scn2k_text.h
+++ b/scn2k/scn2k_text.h
@@ -60,9 +60,12 @@ string kconv_rev(const string& s);
 */
 
 struct TimerAtom {
+	unsigned int start_time;
+};
+
+struct FrameTimerAtom : TimerAtom {
 	int from;
 	int to;
-	unsigned int start_time;
 	unsigned int total_time;
 };
 
@@ -195,7 +198,6 @@ class Text : public CommandHandler {
 		bool ruby_text_flag;
 		unsigned int wait_time;
 		unsigned int old_time;
-		unsigned int base_time;
 		int text_window_number;
 		bool text_parsing;
 		TextStream text_stream;
@@ -203,6 +205,12 @@ class Text : public CommandHandler {
 		int save_selectcount;
 
 		std::map<int, TimerAtom> timer_var;
+		//TODO: Handle EX Timer set
+		std::map<int, TimerAtom> timer_var_ex;
+		//TODO: Handle Frame Timers
+		std::map<int, FrameTimerAtom> frame_var;
+		std::map<int, FrameTimerAtom> frame_var_ex;
+
 		std::vector<WidTextButton*> selects;
 		std::vector<int> sel_backlog_pos;
 		string replace_name[26];
@@ -227,6 +235,7 @@ class Text : public CommandHandler {
 		PicContainer& parent;
 
 		//Opcode handling
+		// Text
 		void impl_txtClear(Cmd& cmd);
 		void impl_logKoe(Cmd& cmd);
 		void impl_pause(Cmd& cmd);
@@ -238,11 +247,39 @@ class Text : public CommandHandler {
 		void impl_msgClear(Cmd& cmd);
 		void impl_FastText(Cmd& cmd);
 		void impl_createSelect(Cmd& cmd);
-		void impl_ShowBackground(Cmd& cmd);
 		void impl_SetSkipMode(Cmd& cmd);
 		void impl_Wait(Cmd& cmd);
+		void impl_PauseCursor(Cmd& cmd);
+		void impl_SetWindowAttr(Cmd& cmd);
+		void impl_GetWindowAttr(Cmd& cmd);
+		void impl_GetName(Cmd& cmd);
+		void impl_SetName(Cmd& cmd);
+		void impl_GetLocalName(Cmd& cmd);
+		void impl_SetLocalName(Cmd& cmd);
+		// Misc (related with text)
+		void impl_ShowBackground(Cmd& cmd);
+		void impl_GetDefConfig(Cmd& cmd);
+		void impl_GetConfig(Cmd& cmd);
+		void impl_SetConfig(Cmd& cmd);
+		// Misc
+		void impl_index_series(Cmd& cmd);
+		void impl_load(Cmd& cmd);
 		void impl_GetClick(Cmd& cmd);
+		// Time/Frame
+		void impl_InitFrame(Cmd& cmd);
 		void impl_ReadFrame(Cmd& cmd);
+		void impl_InitFrames(Cmd& cmd);
+		void impl_ReadFrames(Cmd& cmd);
+		void impl_ResetTimer(Cmd& cmd);
+		void impl_Timer(Cmd& cmd);
+		// Maths
+		void impl_rnd(Cmd& cmd);
+		void impl_pcnt(Cmd& cmd);
+		void impl_abs(Cmd& cmd);
+		void impl_power(Cmd& cmd);
+		void impl_min(Cmd& cmd);
+		void impl_max(Cmd& cmd);
+		void impl_constrain(Cmd& cmd);
 };
 
 #endif