Merged Michelle's code into mine

Michelle now commits directly to the repo, how we should have had it
day one.
ghost has its own file.