Merge in ghost for historical purposes as a significant amount of code was used from it.

Merge branch 'ghost'