23 files changed, 360 insertions, 180 deletions

diff --git a/src/include/ParameterBindings.h b/src/include/ParameterBindings.h
index c1b055df..3720d75f 100644
--- a/src/include/ParameterBindings.h
+++ b/src/include/ParameterBindings.h
@@ -16,7 +16,7 @@
 extern "C" {
 #endif
 
-int ParameterCreate(const char *name,        /* The parameter name */
+int CCTKi_ParameterCreate(const char *name,        /* The parameter name */
                     const char *thorn,       /* The thorn          */ 
                     const char *type,       /* The parameter type */
                     const char *scope,       /* The scoping block  */
@@ -27,7 +27,7 @@ int ParameterCreate(const char *name,        /* The parameter name */
                     int n_ranges,            /* How many allowed ranges it has */
                     ...);
 
-int ParameterAddRange(const char *implementation, 
+int CCTKi_ParameterAddRange(const char *implementation, 
                       const char *name,
                       const char *range_origin,
                       const char *range,
diff --git a/src/include/cctk.h b/src/include/cctk.h
index 249976d8..e4f55fbb 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk.h
@@ -81,6 +81,7 @@
 #include "cctk_ActiveThorns.h"
 #include "cctk_Banner.h"
 #include "cctk_Cache.h"
+#include "cctk_CommandLine.h"
 #include "cctk_Complex.h"
 #include "cctk_Coord.h"
 #include "cctk_File.h"
diff --git a/src/include/cctk_ActiveThorns.h b/src/include/cctk_ActiveThorns.h
index 4f7a7dab..f0eb6e7a 100644
--- a/src/include/cctk_ActiveThorns.h
+++ b/src/include/cctk_ActiveThorns.h
@@ -1,5 +1,5 @@
  /*@@
-   @header    ActiveThorns.h
+   @header    cctk_ActiveThorns.h
    @date      Sun Jul  4 17:39:50 1999
    @author    Tom Goodale
    @desc 
@@ -18,29 +18,19 @@
 extern "C" {
 #endif
 
-int CCTKi_RegisterThorn(const char *name, const char *imp);
-int CCTKi_ActivateThorn(const char *name);
-int CCTK_IsThornActive(const char *name);
-int CCTK_IsThornCompiled(const char *name);
-int CCTK_IsImplementationActive(const char *name);
-int CCTKi_ListThorns(FILE *file, const char *format, int active);
-int CCTKi_ListImplementations(FILE *file, const char *format, int active);
+int         CCTK_IsThornActive(const char *name);
+int         CCTK_IsThornCompiled(const char *name);
+int         CCTK_IsImplementationActive(const char *name);
 const char *CCTK_ActivatingThorn(const char *imp);
 
 /* FIXME - should return a list or something */
 t_sktree *CCTK_ImpThornList (const char *imp);
 
-/* public routines to get information about thorns and imps */
-int CCTK_ImplementationList   (int active,      char ***list, int *n_implementations);
-int CCTK_ImplementationThornList (const char *imp, char ***list, int *n_thorns);
-int CCTK_ThornList(int active, char ***list, int *n_items);
-
 const char *CCTK_ThornImplementation(const char *name);
 const char *CCTK_ImplementationThorn(const char *name);
 
-
 #ifdef __cplusplus 
 }
 #endif
 
-#endif /* _ACTIVETHORNS_H_ */
+#endif /* _CCTK_ACTIVETHORNS_H_ */
diff --git a/src/include/cctk_Cache.h b/src/include/cctk_Cache.h
index 1790bf63..b099443d 100644
--- a/src/include/cctk_Cache.h
+++ b/src/include/cctk_Cache.h
@@ -16,7 +16,7 @@ extern "C"
 {
 #endif
 
-void *CCTK_CacheMalloc(unsigned index, 
+void *Util_CacheMalloc(unsigned index, 
                        unsigned long size, 
                        void **realstart);
 
diff --git a/src/include/cctk_CommandLine.h b/src/include/cctk_CommandLine.h
new file mode 100644
index 00000000..aef2cced
--- /dev/null
+++ b/src/include/cctk_CommandLine.h
@@ -0,0 +1,25 @@
+ /*@@
+   @header    cctk_CommandLine.h
+   @date      Thu Jan 20 2000
+   @author    Gabrielle Allen
+   @desc 
+   Prototypes and constants for command line functions
+   @enddesc 
+   @version $Header$
+ @@*/
+
+#ifndef _CCTK_COMMANDLINE_H_
+#define _CCTK_COMMANDLINE_H_
+
+#ifdef __cplusplus 
+extern "C" 
+{
+#endif
+
+int CCTK_CommandLine(char ***outargv);
+
+#ifdef __cplusplus 
+}
+#endif
+
+#endif /* _CCTK_COMMANDLINE_H_ */
diff --git a/src/include/cctk_Flesh.h b/src/include/cctk_Flesh.h
index 7f1b2bc7..35c38ad8 100644
--- a/src/include/cctk_Flesh.h
+++ b/src/include/cctk_Flesh.h
@@ -36,57 +36,18 @@ extern "C"
 {
 #endif
 
-int InitialiseCactus(int *, char ***, tFleshConfig *);
-
-int InitialiseSubsystemDefaults(void);
-
-void CactusBanner(void);
-
-int InitialiseScheduler(tFleshConfig *ConfigData);
-
-void CCTK_PrintBanners(void);
-
 int CCTKi_SetParameter(const char *parameter, const char *value);
 
-int ShutdownCactus(tFleshConfig *);
+int CCTKi_ProcessCommandLine(int *argc, char ***argv, tFleshConfig *ConfigData);
 
-int ProcessCommandLine(int *argc, char ***argv, tFleshConfig *ConfigData);
+int CCTKi_InitialiseDataStructures(tFleshConfig *ConfigData);
 
-int InitialiseDataStructures(tFleshConfig *ConfigData);
+int CCTKi_ProcessParameterDatabase(tFleshConfig *ConfigData);
 
-int ProcessParameterDatabase(tFleshConfig *ConfigData);
-
-int CallStartupFunctions(tFleshConfig *ConfigData);
+int CCTKi_CallStartupFunctions(tFleshConfig *ConfigData);
 
 int CCTKi_AddGH(tFleshConfig *config, int convergence_level, cGH *GH);
 
-int CCTK_MaxDim(void);
-
-int CCTK_NumVars(void);
-
-int CCTK_NumGroups(void);
-
-int CCTK_VarTypeNumber(const char *type);
-
-int CCTK_GroupTypeNumber(const char *type);
-
-int CCTKi_BindingsImplementationsInitialise(void);
-int CCTKi_BindingsScheduleInitialise(void);
-int CCTKi_BindingsVariablesInitialise(void);
-int CCTKi_BindingsParametersInitialise(void);
-
-int CCTKi_RegisterDefaultTimerFunctions(void);
-
-int CCTK_MainLoopIndex (void);
-
-int CCTK_SetMainLoopIndex (int main_loop_index);
-
-int SetupMainFunctions(void);
-int SetupCommFunctions(void);
-int SetupIOFunctions(void);
-
-int CCTKi_SetupCache(void);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/cctk_GHExtensions.h b/src/include/cctk_GHExtensions.h
index 0a50b449..8b6072a9 100644
--- a/src/include/cctk_GHExtensions.h
+++ b/src/include/cctk_GHExtensions.h
@@ -15,25 +15,33 @@
 extern "C" {
 #endif
 
-int CCTK_RegisterGHExtension(const char *name);
-
-int CCTK_RegisterGHExtensionSetupGH(int handle, 
-                                    void *(*func)(tFleshConfig *, int, cGH *));
-
-int CCTK_RegisterGHExtensionInitGH(int handle, int (*func)(cGH *));
-
-int CCTK_RegisterGHExtensionrfrTraverseGH(int handle, int (*func)(cGH *, int));
-
-int CCTKi_SetupGHExtensions(tFleshConfig *config, 
-                           int convergence_level, 
-                           cGH *GH);
-
-int CCTKi_InitGHExtensions(cGH *GH);
-
-int CCTK_rfrTraverseGHExtensions(cGH *GH, int rfrpoint);
-
-int CCTK_GHExtensionHandle(const char *name);
-
+int CCTK_RegisterGHExtension
+  (
+   const char *name
+  );
+
+int CCTK_RegisterGHExtensionSetupGH
+  (
+   int handle, 
+   void *(*func)(tFleshConfig *, int, cGH *)
+  );
+
+int CCTK_RegisterGHExtensionInitGH
+  (
+   int handle, 
+   int (*func)(cGH *)
+  );
+
+int CCTK_RegisterGHExtensionrfrTraverseGH
+  (
+   int handle, 
+   int (*func)(cGH *, int)
+  );
+
+int CCTK_GHExtensionHandle
+  (
+   const char *name
+   );
 
 #ifdef __cplusplus
 }
diff --git a/src/include/cctk_Groups.h b/src/include/cctk_Groups.h
index 915717ad..35642065 100644
--- a/src/include/cctk_Groups.h
+++ b/src/include/cctk_Groups.h
@@ -27,46 +27,44 @@ typedef struct
 extern "C" {
 #endif
 
-void CCTK_DumpGroupInfo(void); 
-
-int     CCTK_StaggeredGrids(void); 
-int     CCTK_StaggerCodeName(const char *stype); 
-int     CCTK_DirStaggerCodeVal(int dir, int staggercode); 
-int     CCTK_DirStaggerCodeName(int dir, const char *stype); 
-int     CCTK_DecomposeName(const char *fullname, 
-			   char **implementation, 
-			   char **name);
-
-int     CCTK_FirstVarIndex(const char *group);
-int     CCTK_FirstVarIndexI(int group);
-char   *CCTK_FullName(int var);
-
-int     CCTK_GroupData(int group, cGroup *gp);
-int     CCTK_GroupIndex(const char *groupname);
-int     CCTK_GroupIndexFromVar(const char *var);
-int     CCTK_GroupIndexFromVarI(int var);
-char   *CCTK_GroupName(int varnum);
-char   *CCTK_GroupNameFromVarI(int var);
-int     CCTK_GroupScopeNumber(const char *type);
-int     CCTK_GroupTypeFromVarI(int var);
-int     CCTK_GroupTypeNumber(const char *type);
-
-char   *CCTK_ImpFromVarI(int var);
-
-int     CCTK_MaxDim(void);
-
-int     CCTK_NumGroups(void);
-int     CCTK_NumTimeLevelsFromVar(const char *var);
-int     CCTK_NumTimeLevelsFromVarI(int var);
-int     CCTK_NumVars(void);
-int     CCTK_NumVarsInGroup(const char *group);
-int     CCTK_NumVarsInGroupI(int group);
-
-int     CCTK_VarIndex(const char *variablename);
-char   *CCTK_VarName(int varnum);
-int     CCTK_VarTypeI(int var);
-int     CCTK_VarTypeNumber(const char *type);
-char   *CCTK_VarTypeName(int vartype);
+#include "cctk_Types.h"
+
+int        CCTK_DecomposeName(const char *fullname, 
+			      char **implementation, 
+			      char **name);
+
+int        CCTK_FirstVarIndex(const char *group);
+int        CCTK_FirstVarIndexI(int group);
+char      *CCTK_FullName(int var);
+
+int        CCTK_GroupData(int group, cGroup *gp);
+CCTK_INT **CCTK_GroupGhostsizesI(int group);
+int        CCTK_GroupIndex(const char *groupname);
+int        CCTK_GroupIndexFromVar(const char *var);
+int        CCTK_GroupIndexFromVarI(int var);
+char      *CCTK_GroupName(int varnum);
+char      *CCTK_GroupNameFromVarI(int var);
+int        CCTK_GroupScopeNumber(const char *type);
+CCTK_INT **CCTK_GroupSizesI(int group);
+int        CCTK_GroupTypeFromVarI(int var);
+int        CCTK_GroupTypeNumber(const char *type);
+
+char      *CCTK_ImpFromVarI(int var);
+
+int        CCTK_MaxDim(void);
+
+int        CCTK_NumGroups(void);
+int        CCTK_NumTimeLevelsFromVar(const char *var);
+int        CCTK_NumTimeLevelsFromVarI(int var);
+int        CCTK_NumVars(void);
+int        CCTK_NumVarsInGroup(const char *group);
+int        CCTK_NumVarsInGroupI(int group);
+
+int        CCTK_VarIndex(const char *variablename);
+char      *CCTK_VarName(int varnum);
+int        CCTK_VarTypeI(int var);
+int        CCTK_VarTypeNumber(const char *type);
+char      *CCTK_VarTypeName(int vartype);
 
 #ifdef __cplusplus 
 }
@@ -83,4 +81,12 @@ char   *CCTK_VarTypeName(int vartype);
 #define GROUP_PROTECTED 2
 #define GROUP_PUBLIC    3
 
+#define CCTK_SCALAR 1
+#define CCTK_GF     2
+#define CCTK_ARRAY  3
+
+#define CCTK_PRIVATE   1
+#define CCTK_PROTECTED 2
+#define CCTK_PUBLIC    3
+
 #endif
diff --git a/src/include/cctk_ParameterFunctions.h b/src/include/cctk_ParameterFunctions.h
index 78c7df61..4d54b57b 100644
--- a/src/include/cctk_ParameterFunctions.h
+++ b/src/include/cctk_ParameterFunctions.h
@@ -97,12 +97,14 @@ extern "C" {
 #endif
 
 /* set the value of a parameter */
-int ParameterSet   (const char *name,        /* The name of the parameter  */
+int CCTK_ParameterSet (
+		    const char *name,        /* The name of the parameter  */
                     const char *thorn,       /* The originating thorn      */
                     const char *value);      /* The value of the parameter */
 
 /* get the data pointer to and type of a parameter's value */
-void *ParameterGet (const char *name,        /* The name of the parameter  */
+void *ParameterGet (
+		    const char *name,        /* The name of the parameter  */
                     const char *thorn,       /* The originating thorn      */
                     int *type);              /* Holds type of parameter    */
 
@@ -112,7 +114,7 @@ char *ParameterValString (const char *name,  /* The name of the parameter  */
                     const char *thorn);      /* The originating thorn      */
 
 /* walk through list of parameters */
-const char *ParameterWalk(
+const char *CCTK_ParameterWalk(
                     int first,               /* Get first parameter or not */
                     const char *origin);     /* The origin of this walk    */
 
diff --git a/src/include/cctk_Schedule.h b/src/include/cctk_Schedule.h
index 1f0ca6a4..8e14fc2b 100644
--- a/src/include/cctk_Schedule.h
+++ b/src/include/cctk_Schedule.h
@@ -33,7 +33,7 @@ typedef struct
 extern "C" {
 #endif
 
-int CCTK_ScheduleFunction(void *function,
+  /*int CCTK_ScheduleFunction(void *function,
                           const char *name,
                           const char *thorn,
                           const char *implementation,
@@ -70,6 +70,7 @@ int CCTK_ScheduleTraverse(const char *where,
                           int (*calling_function)(void *, void *, void *));
 
 int CCTK_ScheduleGHInit(void *GH);
+  */
 
 int CCTK_SchedulePrint(const char *where);
 int CCTK_SchedulePrintTimes(const char *where);
diff --git a/src/include/cctk_Stagger.h b/src/include/cctk_Stagger.h
index 060a40b6..655a704c 100644
--- a/src/include/cctk_Stagger.h
+++ b/src/include/cctk_Stagger.h
@@ -1,21 +1,27 @@
+ /*@@
+   @header    cctk_Stagger.h
+   @date      Thu Jan 20 2000
+   @author    Gerd Lanfermann
+   @desc 
+   Prototypes and constants for stagger functions.
+   @enddesc 
+   @version $Header$
+ @@*/
 
 #ifndef _CCTK_STAGGER_H_
 #define _CCTK_STAGGER_H_
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int CCTK_StaggeredGrids(void);
+int CCTK_StaggerVars(void);
 int CCTK_StaggerCodeGrpIdx(int gindex);
 int CCTK_StaggerCodeGrp(const char *gname);
 int CCTK_StaggerCodeName(const char *stype);
 int CCTK_DirStaggerCodeVal(int dir, int sc);
 int CCTK_DirStaggerCodeName(int dir, const char *stype);
 
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/cctk_WarnLevel.h b/src/include/cctk_WarnLevel.h
index 3da90c21..52cbda39 100644
--- a/src/include/cctk_WarnLevel.h
+++ b/src/include/cctk_WarnLevel.h
@@ -16,21 +16,19 @@ extern "C"
 {
 #endif
 
-void CCTK_Warn(int level, 
+int CCTK_Warn(int level, 
                int line, 
                const char *file, 
                const char *thorn, 
                const char *message);
-void CCTK_VWarn(int level, 
+int CCTK_VWarn(int level, 
                 int line, 
                 const char *file, 
                 const char *thorn, 
                 const char *format, ...);
-void CCTK_ParamWarn(const char *thorn, const char *message);
-void CCTK_Info(const char *thorn, const char *message);
+int CCTK_ParamWarn(const char *thorn, const char *message);
+int CCTK_Info(const char *thorn, const char *message);
 
-void CCTKi_NotYetImplemented(const char *message);
- 
 #ifdef __cplusplus 
 }
 #endif
diff --git a/src/include/cctk_arguments.h b/src/include/cctk_arguments.h
new file mode 100644
index 00000000..abbc3ae1
--- /dev/null
+++ b/src/include/cctk_arguments.h
@@ -0,0 +1 @@
+#include "cctk_Arguments.h"
diff --git a/src/include/cctk_parameters.h b/src/include/cctk_parameters.h
new file mode 100644
index 00000000..eadb1eee
--- /dev/null
+++ b/src/include/cctk_parameters.h
@@ -0,0 +1 @@
+#include "cctk_Parameters.h"
diff --git a/src/include/cctki_ActiveThorns.h b/src/include/cctki_ActiveThorns.h
new file mode 100644
index 00000000..e3a33cd4
--- /dev/null
+++ b/src/include/cctki_ActiveThorns.h
@@ -0,0 +1,49 @@
+ /*@@
+   @header    cctki_ActiveThorns.h
+   @date      Sun Jul  4 17:39:50 1999
+   @author    Tom Goodale
+   @desc 
+   
+   @enddesc
+   @version $Header$
+ @@*/
+
+#ifndef __CCTKI_ACTIVETHORNS_H_
+#define __CCTKI_ACTIVETHORNS_H_
+
+#include <stdio.h>
+#include "SKBinTree.h"   
+
+#ifdef __cplusplus 
+extern "C" {
+#endif
+
+int CCTKi_RegisterThorn(const char *name, const char *imp);
+int CCTKi_ActivateThorn(const char *name);
+int CCTKi_PrintThorns(FILE *file, const char *format, int active);
+int CCTKi_PrintImps(FILE *file, const char *format, int active);
+
+int CCTKi_ImplementationList
+ (
+  int active,
+  char ***list,
+  int *n_implementations
+ );
+int CCTKi_ImplementationThornList 
+ (
+  const char *imp, 
+  char ***list, 
+  int *n_thorns
+ );
+int CCTKi_ThornList
+ (
+  int active, 
+  char ***list, 
+  int *n_items
+ );
+
+#ifdef __cplusplus 
+}
+#endif
+
+#endif /* _CCTKI_ACTIVETHORNS_H_ */
diff --git a/src/include/cctki_Cache.h b/src/include/cctki_Cache.h
index c924f3bf..b38ed7e8 100644
--- a/src/include/cctki_Cache.h
+++ b/src/include/cctki_Cache.h
@@ -15,10 +15,10 @@ extern "C"
 {
 #endif
 
-int CCTKi_CacheDataSet(unsigned long cacheline_bytes,
+int Utili_CacheDataSet(unsigned long cacheline_bytes,
                        unsigned long cache_size);
 
-int CCTKi_CacheDataGet(unsigned long *cacheline_bytes,
+int Utili_CacheDataGet(unsigned long *cacheline_bytes,
                        unsigned long *cache_size);
 
 #ifdef __cplusplus
diff --git a/src/include/cctki_FortranWrappers.h b/src/include/cctki_FortranWrappers.h
new file mode 100644
index 00000000..3c581007
--- /dev/null
+++ b/src/include/cctki_FortranWrappers.h
@@ -0,0 +1,26 @@
+ /*@@
+   @header    cctki_FortranWrappers.h
+   @date      Sat Sep 18 00:52:35 1999
+   @author    Tom Goodale
+   @desc 
+   Routines for dealing with Fortran wrappers
+   @enddesc 
+ @@*/
+
+#ifndef __CCTKI_FORTRANWRAPPERS_H_
+#define __CCTKI_FORTRANWRAPPERS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int CCTKi_RegisterFortranWrapper(const char *name, int (*function)(void *, void *));
+
+int (*CCTKi_FortranWrapper(const char *name))(void *, void *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/src/include/cctki_GHExtensions.h b/src/include/cctki_GHExtensions.h
new file mode 100644
index 00000000..c06a650b
--- /dev/null
+++ b/src/include/cctki_GHExtensions.h
@@ -0,0 +1,31 @@
+ /*@@
+   @header    cctki_GHExtensions.h
+   @date      Fri Jan 15 14:15:20 1999
+   @author    Tom Goodale
+   @desc 
+   Prototypes for functions dealing with GH extensions.
+   @enddesc
+   @version $Header$
+ @@*/
+
+#ifndef _CCTKI_GHEXTENSIONS_H_
+#define _CCTKI_GHEXTENSIONS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int CCTKi_SetupGHExtensions(tFleshConfig *config, 
+                           int convergence_level, 
+                           cGH *GH);
+
+int CCTKi_InitGHExtensions(cGH *GH);
+
+int CCTKi_rfrTraverseGHExtensions(cGH *GH, int rfrpoint);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/src/include/cctki_Groups.h b/src/include/cctki_Groups.h
index 07625fc7..6cc215f2 100644
--- a/src/include/cctki_Groups.h
+++ b/src/include/cctki_Groups.h
@@ -17,35 +17,25 @@
 extern "C" {
 #endif
 
-int CCTKi_CreateGroup(const char *gname, const char *thorn, const char *imp,
-                      const char *gtype,
-                      const char *vtype,
-                      const char *gscope,
-                      int dimension,
-                      int ntimelevels,
-                      const char *stype,
-                      const char *size,
-                      int n_variables,
-                      ...);
-
-int CCTKi_ParseStaggerString(int dim,  
-			     const char *imp, 
-			     const char *gname,  
-			     const char *stype); 
+void CCTKi_DumpGroupInfo(void); 
+
+int  CCTKi_CreateGroup
+  (const char* gname, 
+   const char* thorn,  
+   const char* imp,
+   const char* gtype,
+   const char* vtype,
+   const char* gscope,
+   int         dimension,
+   int         ntimelevels,
+   const char* stype,
+   const char* size,
+   const char* ghostsize,
+   int         n_variables,
+   ...);
 
 #ifdef __cplusplus 
 }
 #endif
 
-
-/* Group Types */
-
-#define GROUP_SCALAR 1
-#define GROUP_GF     2
-#define GROUP_ARRAY  3
-
-#define GROUP_PRIVATE   1
-#define GROUP_PROTECTED 2
-#define GROUP_PUBLIC    3
-
 #endif
diff --git a/src/include/cctki_Schedule.h b/src/include/cctki_Schedule.h
index 52f8210f..82d6c861 100644
--- a/src/include/cctki_Schedule.h
+++ b/src/include/cctki_Schedule.h
@@ -35,27 +35,81 @@ t_sched_modifier *CCTKi_ScheduleAddModifier(t_sched_modifier *orig,
                                            const char *modifier, 
                                            const char *argument);
 
-int CCTKi_ScheduleFunction(const char *gname, 
-                           const char *fname, 
-                           void *func, 
-                           t_sched_modifier *modifiers, 
-                           void *attributes);
+int CCTKi_ScheduleFunction
+  (
+   void *function,
+   const char *name,
+   const char *thorn,
+   const char *implementation,
+   const char *description,
+   const char *where,
+   const char *language,
+   int n_mem_groups,
+   int n_comm_groups,
+   int n_trigger_groups,
+   int n_before,
+   int n_after,
+   int n_while,
+   ...
+  );
 
-int CCTKi_ScheduleGroup(const char *gname, 
-                        const char *thisname, 
-                        t_sched_modifier *modifiers, 
-                        void *attributes);
+int CCTKi_ScheduleGroup
+  (
+   const char *name,
+   const char *thorn,
+   const char *implementation,
+   const char *description,
+   const char *where,
+   int n_mem_groups,
+   int n_comm_groups,
+   int n_trigger_groups,
+   int n_before,
+   int n_after,
+   int n_while,
+   ...
+  );
+
+int CCTKi_ScheduleGroupStorage(const char *group);
+
+int CCTKi_ScheduleGroupComm(const char *group);
+
+int CCTKi_ScheduleTraverse(const char *where, 
+			   void *GH,   
+			   int (*calling_function)(void *, void *, void *));
+
+int CCTKi_ScheduleGHInit(void *GH);
+
+
+int CCTKi_DoScheduleFunction
+  (
+   const char *gname, 
+   const char *fname, 
+   void *func, 
+   t_sched_modifier *modifiers, 
+   void *attributes
+  );
+
+int CCTKi_DoScheduleGroup
+  (
+   const char *gname, 
+   const char *thisname, 
+   t_sched_modifier *modifiers, 
+   void *attributes
+  );
 
 /* Routine to sort the groups - must be called before traversal. */
-int CCTKi_ScheduleSortAllGroups(void);
+int CCTKi_DoScheduleSortAllGroups(void);
 
 /* Traversal routine */
-int CCTKi_ScheduleTraverse(const char *group_name,
-                           int (*item_entry)(void *, void *),
-                           int (*item_exit)(void *, void *),
-                           int  (*while_check)(int, char **, void *, void *),
-                           int (*function_process)(void *, void *, void *),
-                           void *data);
+int CCTKi_DoScheduleTraverse
+  (
+   const char *group_name,
+   int (*item_entry)(void *, void *),
+   int (*item_exit)(void *, void *),
+   int  (*while_check)(int, char **, void *, void *),
+   int (*function_process)(void *, void *, void *),
+   void *data
+  );
 
 #ifdef __cplusplus
 }
diff --git a/src/include/cctki_Stagger.h b/src/include/cctki_Stagger.h
new file mode 100644
index 00000000..1018232d
--- /dev/null
+++ b/src/include/cctki_Stagger.h
@@ -0,0 +1,27 @@
+ /*@@
+   @header    cctki_Stagger.h
+   @date      Thu Jan 20 2000
+   @author    Gerd Lanfermann
+   @desc 
+   Prototypes and constants for stagger functions.
+   @enddesc 
+   @version $Header$
+ @@*/
+
+#ifndef _CCTKI_STAGGER_H_
+#define _CCTKI_STAGGER_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int CCTKi_ParseStaggerString(int dim,  
+			     const char *imp, 
+			     const char *gname,  
+			     const char *stype); 
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/include/cctki_WarnLevel.h b/src/include/cctki_WarnLevel.h
index 034ca568..b4786cd5 100644
--- a/src/include/cctki_WarnLevel.h
+++ b/src/include/cctki_WarnLevel.h
@@ -17,7 +17,8 @@ extern "C" {
 int CCTKi_SetWarnLevel(int level);
 void CCTKi_FinaliseParamWarn(void);
 int CCTKi_SetErrorLevel(int level);
- 
+void CCTKi_NotYetImplemented(const char *message);
+  
 #ifdef __cplusplus 
 }
 #endif
diff --git a/src/include/rfrConstants.h b/src/include/rfrConstants.h
index c6a03600..2c56eb1d 100644
--- a/src/include/rfrConstants.h
+++ b/src/include/rfrConstants.h
@@ -15,7 +15,9 @@
 #define CCTK_PARAMCHECK  0
 #define CCTK_BASEGRID  1
 
-#define CCTK_RECOVER   5
+#define CCTK_RECOVER
+#define CCTK_RECOVER_PARAMETERS   4
+#define CCTK_RECOVER_VARIABLES   5
 
 /* Be sure to keep the INITIAL*, POSTSTEP*, etc... contiguous */
 #define CCTK_INITIAL   11