First draft of module, imported from svn