initial commit of code that almost does nothing... more to come
Merge remote-tracking branch 'remotes/gh/z3/acfan/master'