@@ -1,55 +1,22 @@
 
-PrivateRules.mak
 /.idea
-/examples/**/*.rst
-/examples/**/*.html
-/examples/**/*.fits
-/examples/arl/*.png
 /examples/experiments
 
-*.pyc
-*.o
-
 /docs/build
 .ipynb_checkpoints
 
-examples/performance/*
-
-workflows/ffiwrapped/ical_starpu/ical_starpu
-workflows/ffiwrapped/ical_starpu/ical_starpu_implicit
-
-__pycache__
 .cache
-/results
 /workspace
-/tests/unittest_results
-
-/examples/ffi_demo/ffi_demo
-/examples/ffi_demo/build
-/examples/result
-/venv-patched
-
-/build
 /algorithm_reference_library.egg-info/
 
-**/*.class
 dask-worker-space
-/docs/libs
 /docs/processing_components
 /docs/workflows
 */notebooks/*_files
 */notebooks/*.rst
 *.log
 *.fits
-/coverage
-*.hdf
-.coverage.*
-.coverage
-dask-work-space
-
-*~
-.DS_Store
-**/.DS_Store
 *.lock
 *.hdf5
-*.jpg
+*.pyc
+/build
@@ -7,6 +7,9 @@
 from jupyter_core.paths import jupyter_data_dir
 from notebook.auth import passwd
 
+# Add global to quiet error checking but I suspect that this file is defunct
+global c
+
 # Setup the Notebook to listen on all interfaces on port 8888 by default
 c.NotebookApp.ip = '*'
 c.NotebookApp.port = 8888
 
@@ -24,7 +24,7 @@
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -47,7 +47,7 @@
 source_suffix = '.rst'
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'
 
 # The master toctree document.
 master_doc = 'index'
@@ -75,9 +75,9 @@
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -86,7 +86,7 @@
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
-#default_role = None
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -97,51 +97,50 @@
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 # If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
+# keep_warnings = False
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = True
 
-
 # -- Options for HTML output ----------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-#html_theme = 'default'
+# html_theme = 'default'
 html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+# html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# html_theme_path = []
 
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
-#html_title = 'crocodile v0.1'
+# html_title = 'crocodile v0.1'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+# html_logo = None
 
 # The name of an image file (relative to this directory) to use as a favicon of
 # the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+# html_favicon = None
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -151,7 +150,7 @@
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-#html_extra_path = []
+# html_extra_path = []
 
 # If not None, a 'Last updated on:' timestamp is inserted at every page
 # bottom, using the given strftime format.
@@ -160,14 +159,14 @@
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}
 
 # If false, no module index is generated.
 html_domain_indices = True
@@ -176,57 +175,57 @@
 html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
 
 # Language to be used for generating the HTML full-text search index.
 # Sphinx supports the following languages:
 #   'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja'
 #   'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr', 'zh'
-#html_search_language = 'en'
+# html_search_language = 'en'
 
 # A dictionary with options for the search language support, empty by default.
 # 'ja' uses this config value.
 # 'zh' user can custom change `jieba` dictionary path.
-#html_search_options = {'type': 'default'}
+# html_search_options = {'type': 'default'}
 
 # The name of a javascript file (relative to the configuration directory) that
 # implements a search results scorer. If empty, the default will be used.
-#html_search_scorer = 'scorer.js'
+# html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'arldoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
+    # The paper size ('letterpaper' or 'a4paper').
+    # 'papersize': 'letterpaper',
+    
+    # The font size ('10pt', '11pt' or '12pt').
+    # 'pointsize': '10pt',
+    
+    # Additional stuff for the LaTeX preamble.
+    # 'preamble': '',
+    
+    # Latex figure (float) alignment
+    # 'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
@@ -239,23 +238,23 @@
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True
 
 
 # -- Options for manual page output ---------------------------------------
@@ -268,7 +267,7 @@
 ]
 
 # If true, show URL addresses after external links.
-#man_show_urls = False
+# man_show_urls = False
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -283,14 +282,13 @@
 ]
 
 # Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
+# texinfo_appendices = []
 
 # If false, no module index is generated.
-#texinfo_domain_indices = True
+# texinfo_domain_indices = True
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
+# texinfo_show_urls = 'footnote'
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
-
+# texinfo_no_detailmenu = False
@@ -1196,7 +1196,7 @@ def arl_invert_2d_ffi(invis, in_image, dopsf, out_image, sumwt):
 @ff.callback("void (*)(const ARLVis *, Image *)", onerror=handle_error)
 def arl_create_image_from_visibility_ffi(vis_in, img_in):
     c_vis = cARLVis(vis_in)
-    c_img = cImage(img_in, new=True);
+    c_img = cImage(img_in, new=True)
 
     # We need a proper Visibility object - not this, and not a cARLVis
     # This is temporary - just so we have some data to pass to
@@ -1240,7 +1240,7 @@ def arl_create_image_from_blockvisibility_ffi(lowconfig, blockvis_in, cellsize,
             equinox='J2000')
 
 # Re-creating Image object
-    py_outimg = cImage(img_out, new=True);
+    py_outimg = cImage(img_out, new=True)
 
 # Construct a model from py_blockvisin
     res = create_image_from_visibility(py_blockvisin, npixel=npixel, frequency=[numpy.average(frequency)], nchan=1,
 
@@ -4,10 +4,8 @@
 """
 
 import collections
-import cffi
-
-import arlwrap
 
+import cffi
 
 ff = cffi.FFI()
 
@@ -16,6 +14,7 @@
 
 count = 0
 
+
 # ff.callback exports the C prototype
 @ff.callback("int(char *)")
 def print_hello_from_python(name=None):
@@ -25,20 +24,21 @@ def print_hello_from_python(name=None):
     elif isinstance(name, ff.CData):
         name = ff.string(name).decode("utf-8")
     print("Hello from Python, {}!".format(name))
-
+    
     if name:
         return len(name)
     return 0
 
+
 # Store the function pointer in an CFFI_func object.
 ffi_phfp = ffi_func(int(ff.cast("size_t", print_hello_from_python)))
 
+
 @ff.callback("int(void)")
 def get_count_from_python(name=None):
     global count
-    count = count + 1;
+    count = count + 1
     return count
 
 
 ffi_gcfp = ffi_func(int(ff.cast("size_t", get_count_from_python)))
-